MSVC maintenance.

diff --git a/cet.c b/cet.c
index 5dc805294f9e9616aef46188e618ecc50e73be25..e4586249f96967ecb0c8731e13734e37282452d7 100644 (file)
--- a/cet.c
+++ b/cet.c
@@ -270,7 +270,7 @@ cet_utf8_to_char(const char *str, const cet_cs_vec_t *vec, /* out */ int *bytes,
  *
  * Returns the number of valid (visible) characters.
  */
-int 
+unsigned int 
 cet_utf8_strlen(const char *str)
 {
        if (str) {

diff --git a/cet.h b/cet.h
index aabec07b26e1ac50614ec3c19b4ba582792f7d89..84099e589874dcc5acdf62044d73164016852c3d 100644 (file)
--- a/cet.h
+++ b/cet.h
@@ -70,7 +70,7 @@ char *cet_str_uni_to_utf8(const short *src, const int length);
 
 /* UTF-8 string manipulation functions */
 
-int cet_utf8_strlen(const char *str);
+unsigned int cet_utf8_strlen(const char *str);
 char *cet_utf8_strdup(const char *str);
 char *cet_utf8_strndup(const char *str, const int maxlen);
 

diff --git a/msvc/GPSBabel.vcproj b/msvc/GPSBabel.vcproj
index 07ed76bd672a9efd36d7c6dfbdd9024a5967cfef..32e4e3939ca6443d3998c22d0c82fa8b8c9fa291 100644 (file)
--- a/msvc/GPSBabel.vcproj
+++ b/msvc/GPSBabel.vcproj
@@ -504,10 +504,6 @@
                                        />
                                </FileConfiguration>
                        </File>
-                       <File
-                               RelativePath="..\dg-100.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\delgpl.c"
                                >
@@ -548,6 +544,10 @@
                                RelativePath="..\destinator.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\dg-100.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\discard.c"
                                >
@@ -716,6 +716,10 @@
                                        />
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\garmin_device_xml.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\garmin_fs.c"
                                >
@@ -876,6 +880,10 @@
                                RelativePath="..\google.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gopal.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gpilots.c"
                                >
@@ -2436,10 +2444,6 @@
                                RelativePath="..\vcf.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\vidaone.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\vecs.c"
                                >
@@ -2476,6 +2480,10 @@
                                        />
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\vidaone.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\vitosmt.c"
                                >
@@ -3154,15 +3162,15 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\jeeps\gpsdevice.h"
+                               RelativePath="..\gbfile.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\gbfile.h"
+                               RelativePath="..\gbtypes.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\gbtypes.h"
+                               RelativePath="..\jeeps\gpsdevice.h"
                                >
                        </File>
                        <File
@@ -3194,7 +3202,8 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\uuid.h">
+                               RelativePath="..\uuid.h"
+                               >
                        </File>
                        <Filter
                                Name="Jeeps-Headers"